diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index 03fc8a6..39eb1cc 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -180,12 +180,7 @@
 			else
 			{
 				// We've selected the DB. Now we set the character set
-				if ( ! $this->db_set_charset($this->char_set, $this->dbcollat))
-				{
-					return FALSE;
-				}
-
-				return TRUE;
+				return $this->db_set_charset($this->char_set, $this->dbcollat);
 			}
 		}
 
@@ -247,9 +242,7 @@
 
 		// Some DBs have functions that return the version, and don't run special
 		// SQL queries per se. In these instances, just return the result.
-		$driver_version_exceptions = array('oci8', 'sqlite', 'cubrid', 'pdo', 'mysqli');
-
-		if (in_array($this->dbdriver, $driver_version_exceptions))
+		if (in_array($this->dbdriver, array('oci8', 'sqlite', 'cubrid', 'pdo', 'mysqli'))
 		{
 			return $sql;
 		}